bitkeeper revision 1.900 (40a1ea95C9xhe9YOF_J5uno7phAXWg)

Merge

diff --cc xen/common/kernel.c
index b33524928d5f15d2f86e1fd1777186e59466dfc4,6cd567d601ae107c41fb4dcc80437e02ef914f00..76747fa981fa90141ecc731d37d6408b84cc8db9
--- 1/xen/common/kernel.c
--- 2/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <xen/console.h>
  #include <xen/net_headers.h>
  #include <xen/serial.h>
 +#include <xen/shadow.h>
+ #include <xen/trace.h>
  
  kmem_cache_t *task_struct_cachep;